projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9715db0 c589b05)
bitkeeper revision 1.1159.1.56 (411ce9a6v81rvYXz3nv5gJ5LNweItA)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 13 Aug 2004 16:17:42 +0000 (16:17 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 13 Aug 2004 16:17:42 +0000 (16:17 +0000)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xeno

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
linux-2.4.26-xen-sparse/mkbuildtree patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc linux-2.4.26-xen-sparse/mkbuildtree
Simple merge
Unnamed repository; edit this file 'description' to name the repository.